Skip to content

Fix varargs type mismatch in NLS.bind invocation #1856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
akurtakov merged 2 commits into from
Jun 9, 2025
Merged

Fix varargs type mismatch in NLS.bind invocation #1856

akurtakov merged 2 commits into from
Jun 9, 2025

Conversation

@SougandhS
Copy link
Contributor

@SougandhS SougandhS commented May 5, 2025

Replace String[] array with individual Object arguments in NLS.bind calls to resolve type mismatch warnings

@eclipse-platform-bot
Copy link
Contributor

eclipse-platform-bot commented May 5, 2025 •
edited
Loading

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
team/examples/org.eclipse.team.examples.filesystem/pom.xml
ua/org.eclipse.help.ui/META-INF/MANIFEST.MF

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch 
From cb9afc6790e965ddeffaa7c7fe86f22d47e50b92 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Sat, 7 Jun 2025 14:45:47 +0000
Subject: [PATCH] Version bump(s) for 4.37 stream


diff --git a/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF b/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
index aa042e2f42..33f9280afc 100644
--- a/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
+++ b/resources/bundles/org.eclipse.core.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.resources; singleton:=true
-Bundle-Version: 3.22.200.qualifier
+Bundle-Version: 3.22.300.qualifier
 Bundle-Activator: org.eclipse.core.resources.ResourcesPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
index 3bd12874e5..2282a03326 100644
--- a/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.team.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.ui; singleton:=true
-Bundle-Version: 3.11.100.qualifier
+Bundle-Version: 3.11.200.qualifier
 Bundle-Activator: org.eclipse.team.internal.ui.TeamUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
index 6150136e39..ce8a09414c 100644
--- a/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
+++ b/team/examples/org.eclipse.team.examples.filesystem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.team.examples.filesystem; singleton:=true
-Bundle-Version: 3.7.700.qualifier
+Bundle-Version: 3.7.800.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.team.examples.filesystem,
diff --git a/team/examples/org.eclipse.team.examples.filesystem/pom.xml b/team/examples/org.eclipse.team.examples.filesystem/pom.xml
index 11bb012a6a..867ff93798 100644
--- a/team/examples/org.eclipse.team.examples.filesystem/pom.xml
+++ b/team/examples/org.eclipse.team.examples.filesystem/pom.xml
@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.team.examples.filesystem</artifactId>
-  <version>3.7.700-SNAPSHOT</version>
+  <version>3.7.800-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
   	<plugins>
diff --git a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
index 1218bc2fd5..7593a41764 100644
--- a/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
+++ b/ua/org.eclipse.help.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %help_system_plugin_name
 Bundle-SymbolicName: org.eclipse.help.ui; singleton:=true
-Bundle-Version: 4.8.100.qualifier
+Bundle-Version: 4.8.200.qualifier
 Bundle-Activator: org.eclipse.help.ui.internal.HelpUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-- 
2.49.0

Further information are available in Common Build Issues - Missing version increments.

@github-actions
Copy link
Contributor

github-actions bot commented May 5, 2025 •
edited
Loading

Test Results

 1 893 files  ±0   1 893 suites  ±0   1h 31m 5s ⏱️ +35s
 4 381 tests ±0   4 357 ✅ ±0   24 💤 ±0  0 ❌ ±0 
13 143 runs  ±0  12 976 ✅ ±0  167 💤 ±0  0 ❌ ±0 

Results for commit 234eee7. ± Comparison against base commit 2d1c1e2.

♻️ This comment has been updated with latest results.

@SougandhS
Copy link
Contributor Author

SougandhS commented May 5, 2025

Hi @HannesWell , could you please check this PR when you have some time ?

@SougandhS SougandhS force-pushed the varArgs_fix branch 4 times, most recently from 8267c27 to de88b87 Compare May 5, 2025 11:14
@SougandhS
Copy link
Contributor Author

SougandhS commented May 5, 2025

Hi @HannesWell , could you please check this PR when you have some time ?

All binding changes has been handled

@HannesWell HannesWell mentioned this pull request May 5, 2025
Merged
@HannesWell
Copy link
Member

HannesWell commented May 5, 2025 •
edited
Loading

Thank you @SougandhS for fixing all these warnings. I should have had a broader look at warnings but I have now created a follow-up that avoids these warnings:

Actually, as mentioned in eclipse-equinox/equinox#936 (comment), I wanted to use/test our automated clean-up job to perform the removal of the unnecessary array creations.
I don't want to reject your work just, for that, but I would still like the clean-up job to create a PR first just to compare the result of your work and that job. But it might prolong the review by a few days.
But the warnings should be gone sooner.

@HannesWell HannesWell mentioned this pull request May 5, 2025
Merged
3 tasks
@SougandhS
Copy link
Contributor Author

SougandhS commented May 6, 2025

Thank you @SougandhS for fixing all these warnings. I should have had a broader look at warnings but I have now created a follow-up that avoids these warnings:

Actually, as mentioned in eclipse-equinox/equinox#936 (comment), I wanted to use/test our automated clean-up job to perform the removal of the unnecessary array creations. I don't want to reject your work just, for that, but I would still like the clean-up job to create a PR first just to compare the result of your work and that job. But it might prolong the review by a few days. But the warnings should be gone sooner.

Thanks, I’ll keep an eye out for the PR from the cleanup job 👍

@akurtakov
Copy link
Member

akurtakov commented Jun 6, 2025

Would you please rebase this PR? There are conflicts.

@SougandhS
Fix varargs type mismatch in NLS.bind invocation
c80e885 
Replaced String[] array with individual Object arguments in NLS.bind
calls to resolve type mismatch warnings and add (Object[]) cast
@SougandhS
Copy link
Contributor Author

SougandhS commented Jun 7, 2025

Would you please rebase this PR? There are conflicts.

Done 👍

@akurtakov akurtakov merged commit 7eeaf35 into eclipse-platform:master Jun 9, 2025
21 of 22 checks passed
@SougandhS
Copy link
Contributor Author

SougandhS commented Jun 9, 2025

Thank you @akurtakov

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@SougandhS @eclipse-platform-bot @HannesWell @akurtakov